Autogenerated HTML docs for v1.4.4.2-g1d77
diff --git a/git-read-tree.html b/git-read-tree.html index bc765ea..1bdc827 100644 --- a/git-read-tree.html +++ b/git-read-tree.html
@@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-read-tree</em> (<tree-ish> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])</p> +<p><em>git-read-tree</em> (<tree-ish> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])</p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -377,6 +377,26 @@ </p> </dd> <dt> +--exclude-per-directory=<gitignore> +</dt> +<dd> +<p> + When running the command with <tt>-u</tt> and <tt>-m</tt> options, the + merge result may need to overwrite paths that are not + tracked in the current branch. The command usually + refuses to proceed with the merge to avoid losing such a + path. However this safety valve sometimes gets in the + way. For example, it often happens that the other + branch added a file that used to be a generated file in + your branch, and the safety valve triggers when you try + to switch to that branch after you ran <tt>make</tt> but before + running <tt>make clean</tt> to remove the generated file. This + option tells the command to read per-directory exclude + file (usually <em>.gitignore</em>) and allows such an untracked + but explicitly ignored file to be overwritten. +</p> +</dd> +<dt> <tree-ish#> </dt> <dd> @@ -662,7 +682,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 03-Oct-2006 08:41:20 UTC +Last updated 13-Dec-2006 21:32:06 UTC </div> </div> </body>
